From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 31 Jan 2011 23:57:36 +0000 (-0500)
Subject: Merge changes from emacs-23 branch
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4986
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e04032d8c9052871bcebacb8f18036795dbcc6f2;p=emacs.git

Merge changes from emacs-23 branch
---

e04032d8c9052871bcebacb8f18036795dbcc6f2